Skip to content

merge queue: embarking 2.29-maintenance (b4cd619), #13602, #13592, #13596, #13637, #13641, #13639, #13618, #13635, #13626, #13628, #13620, #13646, #13610, #13633, #13612, #13605 and [#13650 + #13648] together#13671

Closed
mergify[bot] wants to merge 38 commits into2.29-maintenancefrom
mergify/merge-queue/2900b4f56c

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

Branch 2.29-maintenance (b4cd619), #13602, #13592, #13596, #13637, #13641, #13639, #13618, #13635, #13626, #13628, #13620, #13646, #13610, #13633, #13612, #13605 and [#13650 + #13648] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#13650 + #13648].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • check-success=installer test on macos
  • check-success=installer test on ubuntu
  • check-success=tests on macos
  • check-success=tests on ubuntu
  • check-success=vm_tests
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on macos
    • check-neutral = installer test on macos
    • check-skipped = installer test on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on ubuntu
    • check-neutral = installer test on ubuntu
    • check-skipped = installer test on ubuntu
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on macos
    • check-neutral = tests on macos
    • check-skipped = tests on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on ubuntu
    • check-neutral = tests on ubuntu
    • check-skipped = tests on ubuntu

Required conditions to stay in the queue:

---
checking_base_sha: 1cd17bafd2a1cfb358b8baf206643ef7d1918995
previous_failed_batches: []
pull_requests:
  - number: 13650
  - number: 13648
...

stefanboca and others added 30 commits July 30, 2025 12:04
...and also NIX_STATE_HOME in nix-profile.fish. This is directly
translated from the bash scripts and makes the fish scripts equivalent
in functionality to the bash scripts.

Note that nix-profile.fish checks for NIX_STATE_HOME and
nix-profile-daemon.fish does not, so the two scripts are no longer
identical.

(cherry picked from commit 751f50f)
Waiting for the minio unit is apparently not reliable enough, so let's
also wait for the port.

(cherry picked from commit ca96967)
Allows to copy the archive to a remote host and not get

    error: cannot add path '/nix/store/01x2k4nlxcpyd85nnr0b9gm89rm8ff4x-source' because it lacks a signature by a trusted key

(cherry picked from commit 80a4293)
These tests have been collected from nixpkgs f870c6ccc8951fc48aeb293cf3e98ade6ac42668
usage of builtins.match for x86_64-linux eval system. At most 2 matching and
non-matching cases are included for each encountered regex. This should
hopefully add more confidence when possibly trying to switch the regex implementation
in the future.

(cherry picked from commit d555d6b)
How did this work before...

* Added .direnv/ to gitignore

(cherry picked from commit 58e34a2)
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit 633d391)
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit c0ceaa2)
The latter alias is deprecated in favor of the former, and produces a
warning.

(cherry picked from commit cfc15d6)
This overload isn't actually necessary anywhere and
doesn't make much sense. The pointers to `Value`s are
themselves const, but the `Value`s are mutable.
A non-const member function implies that the object itself
can be modified but this doesn't make much sense considering
the return type: `Value * const * `, which is a pointer
to a constant array of pointers to mutable values.

(cherry picked from commit 7b46eb9)
(cherry picked from commit 699db04)
Running parallel nix in nix can lead to multiple instances trying to
create the state directories and failing on the `createSymlink` step,
because the link already exists.

`replaceSymlink` is already idempotent, so let's use that.

Resolves #2706

(cherry picked from commit d64c922)
(cherry picked from commit 86dda98)
(cherry picked from commit da76bc0)
(cherry picked from commit 785f386)
Remove extra `realise`

(cherry picked from commit df21f24)
We shouldn't leak memory in unit tests in order
to make enabling ASAN easier.

(cherry picked from commit 55d12df)
@github-actions github-actions bot added documentation new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority store Issues and pull requests concerning the Nix store c api Nix as a C library with a stable interface labels Jul 30, 2025
@mergify mergify bot closed this Jul 31, 2025
@mergify mergify bot deleted the mergify/merge-queue/2900b4f56c branch July 31, 2025 03:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c api Nix as a C library with a stable interface documentation new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Development

Successfully merging this pull request may close these issues.